Added improved Language Support and Config