Readded Data Annotations

I have no idea how these got removed.