Got the rest of Types working in the new style