First rough version of RHQ support