Fix duplicate files in demo project and add a delegate method