Added FMiP support