Minor changes because of changes to the base class
Moved version checking to the base class so it can be reused