CLI now outputs context