Modified models to be more modular