added enum + menu popup support