Improved: Installation routine