Added language auto detection