Adding java 1.7 compactibility