Added dom and map utils