Add support for 's in what's