Moved data server into User