Fixed bug with parsing 30HK
Converted map to use std::map instead of std::set