User and settings management added