More changes to client model and the command classes