Add Cross SDKs support (part 2)