Self registration added

Change-Id: Iee3c241348b3887cd7dfa05262d875e306af491c