Added WebApi support