#952 Added DB fields, model fields and spec typo fix