Separated labs for java 8 and 7, added a bit to java 7