Added infrastructure for adding and modifying users