Move type handling to make sure we get all created types that aren't