MADS: Replace some magic values by enums