[BOFTWO-1211] updated command + refactoring