Removed dependency on this context