[Improved] We can support Java 6 for Mac support