moved metric to comparator and starting to extract properties