Changed the way components are identified in callbacks to use a data attribute