Consolidate tuna props

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

Consolidate tuna props