Simplified structure by removing Stats