Enhanced client to implement remaining scenarios