Minor fix & add few classes