Updates for Gort CLI