Added support for Array and Hash attributes