Initial support for keys that contain dots