Adding support for dotted names.