Added core context support