Updated common persistence classes