Cut CustomFactory in two