Moved parser overhead into import