Modified to persistence 1.0.0.Alpha7