Corrected return of Shop to return the correct class