Better design in the example app