CDI scope improvements + ApplicationScoped