Move check stats to a separate table