Use native collections in AbstractConnector

Change-Id: I027cd296e5014d38e908915d537c58f87ebefc50