General Improvements

Added Metric Data Values Property
Cleaned up a few procedures