Should it be part of MITX_FEATURES as well?