Improved code in installation model