add more Xctl commands with ifdef guards