Made changes in CLI - Address