Compatibility with newest tharsis-core,