Completed more of the draft class metadata factory