JH 1 - Basic code enhancements: Token values may contain tokens