Moved more SQL logic to DAO