Separated the Api translation system from the Repositories