Updated for use with CLI
Added links to documentation