Added the basic infrastructure for the new functionality.