Changes to add support for permanent capabilities