#479 WebAPI modifications