Move fetch command into separate handler