Added enum support