Changed method of adding users, may be implemented differently in the future