Added enum types in valueof