Add more models
Add client param to base