AttributeValue primary key fix
Admin finished