Added option to supply language by keyword