Fixing persistence traits