Added enum support.