Added configure option