Added WebAPI support