change scope to ApplicationScoped as Singleton has issues with
serialization