Added equal methods
Refactored for using base class equal methods