Compliance Update

Updated to be usable in JRE7 and JRE8.