Changes to have tuples and planes work in the new object context