WIP: Improved node creation using factories.