code enhancements in service wms