Added References and handler for Configuration.