- Initial changes for UniversalMolecule