Re-added FMP support