Add java7 compiler compatibility