Be more explicit about repository id key