Modified identity entity and fixed persistence.