Issue #25: added TODO markers
ReparentCmd: add missing @NotNull annotations
Refactor parameter-less commands
Issue #26: add TODO markers