Change base class

Add some docs