Change version compatibility with Java 5+