Change to use custom Persona instance