Models updated to listener/user switch