Added project specific custom field support