Adding multiple keyboards support