[WIP] Add new models