Adding a more dynamic model storage system