Added java 7 related features