Switched to use dummy Data Attributes instead of #if