Add language & extension support