More updates to source cli