Added specialized persistence class