#83 Desgin component management