Added enums for Database and switched existing enums to be
constructor-based