Added support for ArrayLists