enum support added