Enhacing i18n and adding code to add new Clients (not working yet)