Improve Api form & translation