Added FileStorage and integrated storage for oauth tokens