Moved user data to the main controller