Factory enhancement