Ensure compatibilty with classes with a factory method + bumped version