Fixed: Managing import at save time takes too much time on refactor