Updated for minimal install