Adding enum support