add java7 support