Added JSON support, added file support.

Annotation support otw