1014827: Being more explicit with unit_key and unit_metadata