Consolidate property definitions
Merge pull request #3 from rwaldron/odp-cleanup

Consolidate property definitions