Added drawing & forms references.