User can continue expired date. Add new fields in some entities.