Now supporting all import properties