added extra fields to subjects and attributes