Fixed oAuth1 auto addition
Refactoring code - history and collections