Added support for general molecules.