Added changes to configure