Continuing work on the Web API