remove _addRaw from container and abstract forking etc away to another object