Add and use CLI --extra-context option