Structural changes for demo authentication