changed model, reporting, test and web-api