Updated for static factories to fix build