Revert addStream method
Implement ResourceManager