Add support for new installer