changed the way we get models to be more flexible for include order