Fixes resource streaming
Created addAllFields and check all scalars
[minor] Cleanup, refactoring