Add support for multiple dots in a name