Selection Module now apart of the core