Adding a controller factory and refactoring the scalability experiment subsequently