#90152 layer resource dao methods refactor