Upgrade to more economic data crawler