Correcting entities structure to avoid fields duplication. Few other changes