Added ExtraData support.