updated fetch class