Added baseline implementation
Renamed metrics