Adding support for environment variables
Minor fix in Language Entity