Work on replacing conforming container with user authored factories