Added initial Map implementation