Updated for new installer