Further Parser Updates

Changed the parser to not be specific to a map.