Added more user stuff