feat: types and set correct component owner (#2700)

feat: types and set correct component owner (#2700) #1971