Further work on authorization framework