Consolidate tuna props

Change-Id: Id97545c2f73710269577db0c0d3214883690b6c8
Merge pull request #10 from dhacker29/cm-11.0

Consolidate tuna props