Added parsing to map