GEP-55 Moved common code to base class