WIP - Modifying components structure