Added Klein extension support.