Adding support for ~