Add events fields to schema