added more mapping and function possibility on web side