Updates
Better defined authentication modularization