adding java 7 support