Moving some functionality from find() to findBySql()
Renaming some variables