Added Jackson Json parsing and started refactoring