Initial commit to expose composite fields (still are not sticky).