Add proper support for toString()