Restructure to be able to extend User