Streamline the API