[MOD] Adapted RESTXQ to refactorings in main project.

Should be merged after Issue #689.