Updated generic DAO - added SQL Injection protection