Added CLI methods