Preprocessing branch to be merged

It adds unit management at reading step