Restructure fetch process