Improve import time by 10%