working on AD and polishing schema