PQueue removed, Authorization collection fixed