Added support for $uid_name