Refactored to HashMap (not sure if working)