some changes to context enum