Added overloaded class struct