Updated installation routine