Add support for anchor type

Change-Id: I834e746bed57005724c339db88c5fb126eb320dd