default values defined
element typed, to be python3 compliant
Merge branch 'model-updates'