Introduced common class definition to control all aspects