1. Update tags and types
2. Rewrite updateModel function
Merge remote-tracking branch 'origin/bleeding-edge-react' into bleeding-edge-react