Add data-id and methods