Switched to hashmaps for storing data in memory