Made model storage more direct