Changed parser to return maps