Context improvements for Genie