Added Context Flag to Delegate