Dropped down fully to jdk 6