Refactored WebApi services