Added support for nil names