Updates for cli and context