Added configure switch