closes #31: refactored persistency ids a bit