Moved storage to Models