Remove singleton to enable multi-threading