Added data attributes based variables support