API update
Rewriting Enumeration class