RIC-641 Add client/server model definitions