Change from provider to enum on annotation