Update for Java 7 backwards compatibility; Update for authorization types