Re-Add forward class declaration