Refactor agile keychain data source