added enum support