Adapt webapp to new logic