Added version-specific implementations