Added more user detail infrastructure classes