Better handling of repository definition on the data nodes