Entrypoint updates