WIP added authorization manager