Added more array indexing to attributes