Resource switched but with no asynchrony
Clean code and comments
Complete the switch to the backend for Resources & Streams