Changes for WebAPI