Added required map symbols and logic.