improve Context parent