Changing to use extension methods

Turns out it's easier to use extension methods on TableQuery<T>