Adding support for minimal installation