Add IDEA stuff
Migrate to Jackson for JSON