Rewrite find_by_cls/dt methods to use iteritems