Updated User and Role to use Enum datatypes.