Added enum wrapper