Added User model to unifiy if a user is returned