new classes added to refactor