Adding Mads Internal classes