Fixing indexes
Fixing the DI container usage
Moving script to a better place