Added wrapper for self contained tokens