Added onAdd and onRemove on NetworkComponents