Changes made for Modifier API change in FM