Modified API for more streamlined user experience