Updated to use java 1.7