Updated forward declaration