Adding somes instrumentions in Server, Client and portProvided class.