Added support to JR + minor fixes.