Add support for dot