Additions required for CLI