Fix Streams CRUD