improve Contributors class

Change-Id: Icb6d5d6fe90a1622050e90fb1449cca54d75cf25