Adding map- directive and more