Updated template picker sample to work with latest