Added configure support