Minor changes

Class and minor changes