Added source fields and extra fields to models