Updated model fields
Merge pull request #23 from shawnhermans/metric-model

Updated model fields Closes #18 and Closes #22