Added enum data attribute and helper/extension methods