Java6 support