Updated to Async Analytics Code