Fixed dependency injection order