Updated The provider to not use the simple annotation