Refactoring of metric data structures
Exposed child class instead of the parent class
Refactoring managed object catalog