- Server code adapted to commands new hierarchy.