updated to token-based accessmodel