Refactored the RQL methods