[Refactoring] Modified HQ constants, and building mappings.