Enhance Neutron support