Finished migration to metric object, fixing issue #2