Implement changes to RadixCore