Better support for instanceless installations