Edited User and Team entities