Minor updates
New base class