Added more mock-check types as object