Updated API entry point