Added changes to map directive