Added preliminary shovel support