Updated feature: Updated factory and constructor calls