Adding complex names support