Works with moved model code