Added DrawFactory