Create improved installation routine