Update sample project to use helpers