Recommit: Fixed DAO and Model Classes