Update to sync solution with solution template