Added boxes for Java6 and Java7