modify import and fetch method