Added models and spec