Added assembly and dropped to Java 1.6