Added compliance for older Java versions