Changed the framework to use IQueryable<>