Issue #149: Web sample refactoring