Created AccessToken class
Improved check if grant handler called token store