added payload check and service unbinding