Few enhancements
Revert addStream method
Revert addStream method
Implement ResourceManager