Added map objects and parsing (not tested).