Updated request processing and added token support