Update according to webapp re-structure