Added new refactor class Show