Split out importing a bit more to be able to have more types