[FEAT] Dynamically add structures