Changes to support seperate prima repository