Added attribute collection handling