Make SOFTWARE hive optional