Refactored to remove dependence on org.nuiton.j2r
Finished all implementation