Refining metadata layout