Change scope to ApplicationScoped