Changed persistence to use lazy saving via Savable interface