Updated controllers + user's handling