File reworking, introduce selection manager