removed find_by usage for compatibility