add scopes for enum
bugs fixed