Fixed DAO and Model Classes