Changes for new configure