Updating to match cartridge code changes and remove deprecated functions