Added Map extensions, arguments reorders and some docs