#479 WebAPI and codeAPI modifications