Adopt to JDK5