Temporary fix to extraData, this way we can change it values on-the-fly