Improve and add translation