Rewrite for API Samples