Moving workspace commands compatible with 4.0.x