Mass connector refactoring

Change-Id: If20fd2fc6afebf475dba664306cac337e22d4f25