Refactoring - created Container class from which the other classes inherit containing functions