Added Java classes.
Added support for CatchIntermediate.