Support for js maps
Various changes