About to restructure user Model