Added handling for data attribute