Added automatic model space updates