Fixing classes
Fixing classes
Fixing dependency injection