Added metric filtering support