Moved class definition to .h