Unfortunately yes for now, I'll decouple it after components merge to avoid mess.