Move Analytics inside closing body