updated template solution class