Added array support for scaffold