Moved class definition to header