Improved import

removed push api dependency. all allocation & transfer is done "in-house"