Added an option to configure in autogen