Switched to using a real object system.