Add moment (time) and commander (cli support)