Converted web mapper functions and variables to a object.
merged changes