Missing parts

Change-Id: I478a8d413414e4a5536c10e7589338461080371d