Work in progress permission handling updates