Fixed issues with data storage, added needed models