Made it Generic