More work on the bespoke object system