Adds token; Refactors samples