Added Java6 support
Added Java6 support