Extension points for clients

Change-Id: Ib4d1d45bde7bd8b0edc224d84c75dafd15b6f455