7c9eeea Better *Factory implmentation.