Feature/prefix agile keychain implementation details