Maybe we should also pass in the container here