Some improvements on webservice. V1.0