WIP refactoring for modular components