Added new Map utils