Import improvements