Added fields to models