Added two more data traits.