RIC-641 Fixing client/server model definitions and adding client and server API