Cleanup usings, add possibility to let the Query interface sort for you