Update to language variable and move of base url to class property