Moved class declaration to header file