Various work & import optimization