Updated due to jdk-7 dependency