Final update for RadixCore