Allow for Projects and Datasets along with proper sort semantics