Main solution class added