Modify raw functionality so array placeholders are automatically expanded to array size