services resoureces refactor