Add DataProperty annotation and DataType enum