Simplified context assignment and expansion