Rename 'extend' back to 'expands' and allow array