Updated logic for importing when pulling