The types of a few properties were missing. Types replaced.
Merge branch 'api' into whitehat-schema