Added unmarshall call to server handle