Improved configure