Updated forward reference class