Add support for complex names like a.b.c.d