Scala 2.10.3
Rewrite client package