Added attribute data extraction