Fixed persistence and spring injection.