Wrap up the outter class fixes