More component migration and DOXY