Improved site characterization indicators

Summary
Improved site characterization indicators