EG/HM: Added xcql and meresco_srw