Add context property options to cli