Making build backword compatible with JDK 1.6