Compatibility with latest soluble components version