Finished separation of Builders, made builders final.
Added toBuilder() method for all kind of contexts and queries.
 Fixed invalid inheritance for some query types.
 Added according create methods and made constructors private.
Finished separation of Builders, made builders final.
Added toBuilder() method for all kind of contexts and queries.
 Fixed invalid inheritance for some query types.
 Added according create methods and made constructors private.
Unified queries with common aspects.