Import fixes
Move tasks/bulk code