Update raw schemas
Fix bug with uncleared collections