enhanced models, delete SocketIO dependence for now