added compatability fields
Merge branch 'comp'