[server] Some model changes