Refactoring methods to the super class for better reusing.
Refactoring methods to the super class for better reusing.

DataViva/dataviva-site,DataViva/dataviva-site,DataViva/dataviva-site,DataViva/dataviva-site