Updates for new context support