Adding web + api part