refactor of data classes to inherit from a base class
refactor of data classes to inherit from a base class

mjn19172/Savu,swtp1v07/Savu,swtp1v07/Savu,mjn19172/Savu,mjn19172/Savu,mjn19172/Savu,mjn19172/Savu,swtp1v07/Savu,swtp1v07/Savu