Changed to java 1.7.
Added util classes