More setup - Added user system