Adding HashMaps and adjusting course parsing rules