Added support for maximum token validity