Make MBR functionality optional