removed custom name value collection as being redundant