Added new find_by method