Better reinstall support