Web App + minor API changes