Adding a single-reference mode.
Adding a production configuration and the legacy specific query.