Fix: improved authorization structure