Added more entry points.