Import improvements

Missing tabs