Updated models and spec