adapting for poc-7 final (eth:47)  :
+ Repository refactoring