Improve install infrastructure handler