Improved handling of scope with model opperations
1.11.1