Updating formating
Adding cfg for tokens