Fix methods to use Linq2Sql