Updated how enum options are returned to the client to be an object of key/value pairs.