Added more instance classes