added enum support, other properties