Removing rql dependency