Fixed factories. Added data to nodes.