#60 replace molecule node types with factory