Moved data storage to map