Move feature selection to xml