Refactored QueryPartsBuilder to Singleton