Balanced: Refactor & handle legacy authorizations