Add more missing data-role attributes