Added enum support, needs further work for edit/create