Switch to using WebAPI