Refactor current data models specs

Ref #21