Refactor to fit to translation extension