- Changed HashMap to Map to avoid using implementation type