Add Context support