Refactored & added stub authentication