Updated with adding new users