This is a breaking change, but I'm not happy with the model stuff.