Switched to WebApi