Refactored the way models are served from data