Moved Metrics
Fixed issues with manifest