* Add referenced components, avoid null pointer exceptions