Refactoring, sets.xml updated, Cached Accounts Reader implemented