Added data attributes to pass in dynamic messages