Changed database object to use Enumerated types for readability