Added configure options