Adding in model generator