Change definition of some database types for clarity