Continuing to update the infrastructure name space