Ensure Type objects are created correctly everywhere and add guardrail