Modifications in the simpleclient