Added support for dynamic keys based on token