Add return statements to more persistence methods