[WIP] Add Client model