#4 #17 #43 Rework import feature