Revamped entire users system