Fixed config and added HQM