JWrapper changes