Adding Java 6 and 7 contexts #40