Improved interactive setup