Switched to using just one user entity