Change to Statistics Bean Structure