Removed stats_only and added exceptions