Changed: Auto include Metrics
Refractored: pom.xml