Add client-related models; polish existing models