Moved to custom data-attributes instead of classes