Context logic and tree update