CalculatorModelBundle is now an external dependency