add contents model
Merge branch 'GS-17-TRN' into GS-15-TRN