Updated feature to use radix layouts