Reworked ToScalaClient and ToScalaServer wrappers