refactor RYServices