Enhance Fragment handling