NXP-12506 Align directory writers with new EntityWriter
NXP-12506 Align user/gruops writers with new EntityWriter