modified fetching classes