Further code changes for the new translation system