Switch to new object system, exposing many types