Added metrics for remaining entities.