Also removed document factory