Updated for radix layouts