Implemented map/unmap commands