Added feature selection to the shared utils