Added Java 1.6 Compatibility

Lists are now defined by enums
Diamond notation for HashMap reverted