Cleaned up FMP support