rename variable because data is not really serialized, and remove wip property