Device-specific : Some structural changes (No API change)