Updated database with correct expirations.
started to implement entity name replacement...