Update docuemntation and parameters for token store.
Add stubbed queue mechanism for margarine.