Fix node-based creation