Improving a bit TypeWrapper classes