Replaced with @Dependent