Changed common provider to many providers for every class