Updated for new installation handling