Added more endpoints