Rebased project based on Java version 1.6