JDK6 adjustments: changed primitive types to object types (e.g. long to Long)