Added all but Matrix basic classes