Adding map function (not tested yet)
Merging aleger updates