Removed all find_by methods and changed them parametrizated  queries