Refine touched status management