Adding support to complex name.