Added make_user and new_user