Security fix + share data persisted in entry