Forgot a few components

Change-Id: Iec362bb343d1b0e48341ee669853aefd42d7b0bf