Changes for deer
Annotation and parsing changes
Add raw annotation support
Fixes for annotations
Move simple model to client