Added mp_config support and test