Added support for Prep APIs