Switch over to use entry points