Fix for #215 and some other related improvements

I suggest moving the `T_` constants to `AbstractClient`