Deep extend

Change-Id: I56b62d2da18887c6577ba7537d49344fbdb30608