Refactor and add argument forwarding to addComponent