Updated version of configure