Consolidated classes into one class