Minor improvement: Persistence Values are not hardcoded anymore