Changing fields in Dao to use constants