Preserved DOM Object classes and added id to data-id