Convert to Java SE 1.7