Refactor list and create authorizations