Added minimal version of map