Updated to use data-key