Removed dependency on DbContext