Adapted entry serialization to new tag scheme