Make relavent changes for nfc-game refactor.